d/rules: install examples in arch-indep build

diff --git a/debian/changelog b/debian/changelog
index 2c9d36e511db86b75ed3c528abae0acf1237b497..3ff936b2ae69d3f2316d4ee619ce8690b2c2ab5b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dcmtk (3.6.2-2) unstable; urgency=medium
+
+  * d/rules: install examples in arch-indep build to fix -A build
+
+ -- Gert Wollny <gewo@debian.org>  Tue, 22 Aug 2017 12:46:09 +0000
+
 dcmtk (3.6.2-1) unstable; urgency=medium
 
   * Upload to unstable

diff --git a/debian/dcmtk.examples b/debian/dcmtk.examples
index 31511743ac7f8813adfc84fe219ffe1168ae304c..2c44e66e9c9489b20f2070901e8055f534f26784 100644 (file)
--- a/debian/dcmtk.examples
+++ b/debian/dcmtk.examples
@@ -1,2 +1,2 @@
-debian/dcmtk/usr/share/dcmtk/wlistdb
-debian/dcmtk/usr/share/dcmtk/wlistqry
+debian/tmp/usr/share/dcmtk/wlistdb
+debian/tmp/usr/share/dcmtk/wlistqry

diff --git a/debian/rules b/debian/rules
index 3b027d5756baaece7d7ac06e638347f0cd4d5f82..73fd91c12db28cea3ae08cd6ed2fe184e6929285 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -52,11 +52,6 @@ override_dh_auto_build-arch:
        #$(MAKE) -C obj-* man
        dh_auto_build
 
-override_dh_installman:
-       LD_LIBRARY_PATH=debian/libdcmtk12/usr/lib/ \
-       help2man --version-string 3.6.2 -n "msgserv: Sample message server for class DVPSIPCClient" --no-info debian/dcmtk/usr/bin/msgserv  > msgserv.1
-       dh_installman msgserv.1
-
 # Let's be smart with building doc
 override_dh_auto_build-indep:
        $(MAKE) -C obj-* DOXYGEN
@@ -72,6 +67,8 @@ override_dh_auto_install-arch:
 
 override_dh_auto_install-indep:
        DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C obj-*/doxygen install 
+       DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C obj-*/dcmwlm/data install 
+
 
 override_dh_installdocs:
        dh_installdocs
@@ -84,8 +81,10 @@ override_dh_install-arch:
        rm ./debian/dcmtk/usr/bin/*_tests
        rm ./debian/dcmtk/usr/bin/drttest
        rm ./debian/dcmtk/usr/bin/mkreport
+       rm ./debian/dcmtk/usr/bin/msgserv
        rm ./debian/dcmtk/usr/bin/wltest
 
+
 get-orig-source:
        uscan --force-download --verbose --rename